New API to handle the clipboard manager.
authorAnders Carlsson <andersca@imendio.com>
Mon, 25 Oct 2004 18:53:30 +0000 (18:53 +0000)
committerAnders Carlsson <andersca@src.gnome.org>
Mon, 25 Oct 2004 18:53:30 +0000 (18:53 +0000)
2004-10-25  Anders Carlsson  <andersca@imendio.com>

* gdk/gdk.symbols:
* gdk/gdkdisplay.h:
* gdk/x11/gdkdisplay-x11.c:
(gdk_display_supports_clipboard_persistence),
(gdk_display_store_clipboard):
New API to handle the clipboard manager.

* gtk/gtk.symbols:
* gtk/gtkclipboard.c: (gtk_clipboard_class_init),
(gtk_clipboard_finalize), (selection_clear_event_cb),
(clipboard_unset), (gtk_clipboard_set_text),
(gtk_clipboard_request_targets), (gtk_clipboard_wait_for_targets),
(clipboard_peek), (gtk_clipboard_owner_change),
(gtk_clipboard_wait_is_target_available),
(gtk_clipboard_store_timeout), (gtk_clipboard_set_can_store),
(gtk_clipboard_selection_notify), (gtk_clipboard_store),
(_gtk_clipboard_store_all):
* gtk/gtkclipboard.h:
Add API for clipboard persistence and implement it, also add
gtk_clipboard_wait_is_target_available.

* gtk/gtkmain.c: (gtk_main):
Call _gtk_clipboard_store_all before exiting.

ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gdk/gdk.symbols
gdk/gdkdisplay.h
gdk/x11/gdkdisplay-x11.c
gtk/gtk.symbols
gtk/gtkclipboard.c
gtk/gtkclipboard.h
gtk/gtkmain.c

index a21e53c188e27f6974097d27d7cf3ef75f659459..b1b28109b4370958fb6188b5d36035a5b9bbe635 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2004-10-25  Anders Carlsson  <andersca@imendio.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkdisplay.h:
+       * gdk/x11/gdkdisplay-x11.c:
+       (gdk_display_supports_clipboard_persistence), 
+       (gdk_display_store_clipboard):
+       New API to handle the clipboard manager.
+
+       * gtk/gtk.symbols:
+       * gtk/gtkclipboard.c: (gtk_clipboard_class_init),
+       (gtk_clipboard_finalize), (selection_clear_event_cb),
+       (clipboard_unset), (gtk_clipboard_set_text),
+       (gtk_clipboard_request_targets), (gtk_clipboard_wait_for_targets),
+       (clipboard_peek), (gtk_clipboard_owner_change),
+       (gtk_clipboard_wait_is_target_available),
+       (gtk_clipboard_store_timeout), (gtk_clipboard_set_can_store),
+       (gtk_clipboard_selection_notify), (gtk_clipboard_store),
+       (_gtk_clipboard_store_all):
+       * gtk/gtkclipboard.h:
+       Add API for clipboard persistence and implement it, also add
+       gtk_clipboard_wait_is_target_available.
+       
+       * gtk/gtkmain.c: (gtk_main):
+       Call _gtk_clipboard_store_all before exiting.
+       
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaboutdialog.h: 
index a21e53c188e27f6974097d27d7cf3ef75f659459..b1b28109b4370958fb6188b5d36035a5b9bbe635 100644 (file)
@@ -1,3 +1,29 @@
+2004-10-25  Anders Carlsson  <andersca@imendio.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkdisplay.h:
+       * gdk/x11/gdkdisplay-x11.c:
+       (gdk_display_supports_clipboard_persistence), 
+       (gdk_display_store_clipboard):
+       New API to handle the clipboard manager.
+
+       * gtk/gtk.symbols:
+       * gtk/gtkclipboard.c: (gtk_clipboard_class_init),
+       (gtk_clipboard_finalize), (selection_clear_event_cb),
+       (clipboard_unset), (gtk_clipboard_set_text),
+       (gtk_clipboard_request_targets), (gtk_clipboard_wait_for_targets),
+       (clipboard_peek), (gtk_clipboard_owner_change),
+       (gtk_clipboard_wait_is_target_available),
+       (gtk_clipboard_store_timeout), (gtk_clipboard_set_can_store),
+       (gtk_clipboard_selection_notify), (gtk_clipboard_store),
+       (_gtk_clipboard_store_all):
+       * gtk/gtkclipboard.h:
+       Add API for clipboard persistence and implement it, also add
+       gtk_clipboard_wait_is_target_available.
+       
+       * gtk/gtkmain.c: (gtk_main):
+       Call _gtk_clipboard_store_all before exiting.
+       
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaboutdialog.h: 
index a21e53c188e27f6974097d27d7cf3ef75f659459..b1b28109b4370958fb6188b5d36035a5b9bbe635 100644 (file)
@@ -1,3 +1,29 @@
+2004-10-25  Anders Carlsson  <andersca@imendio.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkdisplay.h:
+       * gdk/x11/gdkdisplay-x11.c:
+       (gdk_display_supports_clipboard_persistence), 
+       (gdk_display_store_clipboard):
+       New API to handle the clipboard manager.
+
+       * gtk/gtk.symbols:
+       * gtk/gtkclipboard.c: (gtk_clipboard_class_init),
+       (gtk_clipboard_finalize), (selection_clear_event_cb),
+       (clipboard_unset), (gtk_clipboard_set_text),
+       (gtk_clipboard_request_targets), (gtk_clipboard_wait_for_targets),
+       (clipboard_peek), (gtk_clipboard_owner_change),
+       (gtk_clipboard_wait_is_target_available),
+       (gtk_clipboard_store_timeout), (gtk_clipboard_set_can_store),
+       (gtk_clipboard_selection_notify), (gtk_clipboard_store),
+       (_gtk_clipboard_store_all):
+       * gtk/gtkclipboard.h:
+       Add API for clipboard persistence and implement it, also add
+       gtk_clipboard_wait_is_target_available.
+       
+       * gtk/gtkmain.c: (gtk_main):
+       Call _gtk_clipboard_store_all before exiting.
+       
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaboutdialog.h: 
index a21e53c188e27f6974097d27d7cf3ef75f659459..b1b28109b4370958fb6188b5d36035a5b9bbe635 100644 (file)
@@ -1,3 +1,29 @@
+2004-10-25  Anders Carlsson  <andersca@imendio.com>
+
+       * gdk/gdk.symbols: 
+       * gdk/gdkdisplay.h:
+       * gdk/x11/gdkdisplay-x11.c:
+       (gdk_display_supports_clipboard_persistence), 
+       (gdk_display_store_clipboard):
+       New API to handle the clipboard manager.
+
+       * gtk/gtk.symbols:
+       * gtk/gtkclipboard.c: (gtk_clipboard_class_init),
+       (gtk_clipboard_finalize), (selection_clear_event_cb),
+       (clipboard_unset), (gtk_clipboard_set_text),
+       (gtk_clipboard_request_targets), (gtk_clipboard_wait_for_targets),
+       (clipboard_peek), (gtk_clipboard_owner_change),
+       (gtk_clipboard_wait_is_target_available),
+       (gtk_clipboard_store_timeout), (gtk_clipboard_set_can_store),
+       (gtk_clipboard_selection_notify), (gtk_clipboard_store),
+       (_gtk_clipboard_store_all):
+       * gtk/gtkclipboard.h:
+       Add API for clipboard persistence and implement it, also add
+       gtk_clipboard_wait_is_target_available.
+       
+       * gtk/gtkmain.c: (gtk_main):
+       Call _gtk_clipboard_store_all before exiting.
+       
 2004-10-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkaboutdialog.h: 
index 82092d8e88a6bf0a0d6ca82469b8f3c15539f530..af498c1e41b8e11b33554eb59bb396c3f9689cab 100644 (file)
@@ -92,6 +92,8 @@ gdk_display_request_selection_notification
 gdk_display_set_double_click_distance
 gdk_display_set_double_click_time
 gdk_display_set_pointer_hooks
+gdk_display_store_clipboard
+gdk_display_supports_clipboard_persistence
 gdk_display_supports_cursor_alpha
 gdk_display_supports_cursor_color
 gdk_display_supports_selection_notification
index 75c1b9c3ed9cc686a4f9db14fc5141eec22b5939..219de1e537e79d4b9c023f2c925d4867e4629478 100644 (file)
@@ -168,6 +168,13 @@ gboolean gdk_display_supports_selection_notification (GdkDisplay *display);
 gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
                                                      GdkAtom     selection);
 
+gboolean gdk_display_supports_clipboard_persistence (GdkDisplay *display);
+void     gdk_display_store_clipboard                (GdkDisplay *display,
+                                                    GdkWindow  *clipboard_window,
+                                                    guint32     time_,
+                                                    GdkAtom    *targets,
+                                                    gint        n_targets);
+
 G_END_DECLS
 
 #endif /* __GDK_DISPLAY_H__ */
index 578864ebf08b9c601927d4c445924df99cd83f7c..588285dca008b4d6eda20fedd9a967f57f69b7f3 100644 (file)
@@ -1,7 +1,8 @@
 /* GDK - The GIMP Drawing Kit
  * gdkdisplay-x11.c
  * 
- * Copyright 2001 Sun Microsystems Inc. 
+ * Copyright 2001 Sun Microsystems Inc.
+ * Copyright (C) 2004 Nokia Corporation
  *
  * Erwann Chenede <erwann.chenede@sun.com>
  *
@@ -1077,3 +1078,86 @@ gboolean gdk_display_request_selection_notification  (GdkDisplay *display,
 #endif
     return FALSE;
 }
+
+/**
+ * gdk_display_supports_clipboard_persistence
+ * @display: a #GdkDisplay
+ *
+ * Returns whether the speicifed display supports clipboard
+ * persistance; if it's possible to store the clipboard data after an
+ * application has quit. On X11 this checks if a clipboard daemon is
+ * running.
+ *
+ * Returns: %TRUE if the display supports clipboard persistance.
+ *
+ * Since: 2.6
+ */
+gboolean
+gdk_display_supports_clipboard_persistence (GdkDisplay *display)
+{
+  /* It might make sense to cache this */
+  return XGetSelectionOwner (GDK_DISPLAY_X11 (display)->xdisplay,
+                            gdk_x11_get_xatom_by_name_for_display (display, "CLIPBOARD_MANAGER")) != None;
+}
+
+/**
+ * gdk_display_store_clipboard
+ * @display:          a #GdkDisplay
+ * @clipboard_window: a #GdkWindow belonging to the clipboard owner
+ * @time:             a timestamp
+ * @targets:         an array of targets that should be saved, or NULL 
+ *                    if all available targets should be saved.
+ * @n_targets:        length of the array
+ *
+ * Issues a request to the the clipboard manager to store the
+ * clipboard data. On X11, this is a special program that works
+ * according to the freedesktop clipboard specification, available at
+ * <ulink url="http://www.freedesktop.org/Standards/clipboard-manager-spec">
+ * http://www.freedesktop.org/Standards/clipboard-manager-spec</ulink>
+ *
+ * Since: 2.6
+ */
+void
+gdk_display_store_clipboard (GdkDisplay *display,
+                            GdkWindow  *clipboard_window,
+                            guint32     time_,
+                            GdkAtom    *targets,
+                            gint        n_targets)
+{
+  GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (display);
+  Atom clipboard_manager, save_targets;
+  
+  clipboard_manager = gdk_x11_get_xatom_by_name_for_display (display, "CLIPBOARD_MANAGER");
+  save_targets = gdk_x11_get_xatom_by_name_for_display (display, "SAVE_TARGETS");
+
+  gdk_error_trap_push ();
+
+  if (XGetSelectionOwner (display_x11->xdisplay, clipboard_manager) != None)
+    {
+      Atom property_name = None;
+      Atom *xatoms;
+      int i;
+      
+      if (n_targets > 0)
+       {
+         property_name = gdk_x11_atom_to_xatom_for_display (display, _gdk_selection_property);
+
+         xatoms = g_new (Atom, n_targets);
+         for (i = 0; i < n_targets; i++)
+           xatoms[i] = gdk_x11_atom_to_xatom_for_display (display, targets[i]);
+
+         XChangeProperty (display_x11->xdisplay, GDK_WINDOW_XID (clipboard_window),
+                          property_name, XA_ATOM,
+                          32, PropModeReplace, (guchar *)xatoms, n_targets);
+         g_free (xatoms);
+
+       }
+      
+      XConvertSelection (display_x11->xdisplay,
+                        clipboard_manager, save_targets, property_name,
+                        GDK_WINDOW_XID (clipboard_window), time_);
+      
+    }
+  gdk_error_trap_pop ();
+
+}
index cc3f2ccfb96c96d8a99b7a3a2db10343c88c4c46..608c350019410fce074e3c954584d1c53ef9f2ef 100644 (file)
@@ -302,13 +302,16 @@ gtk_clipboard_get_type
 gtk_clipboard_request_contents
 gtk_clipboard_request_targets
 gtk_clipboard_request_text
+gtk_clipboard_set_can_store
 gtk_clipboard_set_text
 gtk_clipboard_set_with_data
 gtk_clipboard_set_with_owner
+gtk_clipboard_store
 gtk_clipboard_wait_for_contents
 gtk_clipboard_wait_for_targets
 gtk_clipboard_wait_for_text
 gtk_clipboard_wait_is_text_available
+gtk_clipboard_wait_is_target_available
 gtk_clist_append
 gtk_clist_clear
 gtk_clist_columns_autosize
index fb5b8dddcdd02bdb83a1cfb7ee3193b7363d5e16..abb6ad26487b95d22215bfbae9cac52f86f016de 100644 (file)
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * Copyright (C) 2000 Red Hat, Inc.
+ * Copyright (C) 2004 Nokia Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -62,6 +63,16 @@ struct _GtkClipboard
 
   gboolean have_selection;
   GdkDisplay *display;
+
+  GdkAtom *cached_targets;
+  gint     n_cached_targets;
+
+  guint      notify_signal_id;
+  gboolean   storing_selection;
+  GMainLoop *store_loop;
+  guint      store_timeout;
+  gint       n_storable_targets;
+  GdkAtom   *storable_targets;
 };
 
 struct _GtkClipboardClass
@@ -90,21 +101,27 @@ struct _RequestTargetsInfo
   gpointer user_data;
 };
 
-static void gtk_clipboard_class_init (GtkClipboardClass *class);
-static void gtk_clipboard_finalize   (GObject           *object);
+static void gtk_clipboard_class_init   (GtkClipboardClass   *class);
+static void gtk_clipboard_finalize     (GObject             *object);
+static void gtk_clipboard_owner_change (GtkClipboard        *clipboard,
+                                       GdkEventOwnerChange *event);
+
+static void          clipboard_unset      (GtkClipboard     *clipboard);
+static void          selection_received   (GtkWidget        *widget,
+                                          GtkSelectionData *selection_data,
+                                          guint             time);
+static GtkClipboard *clipboard_peek       (GdkDisplay       *display,
+                                          GdkAtom           selection,
+                                          gboolean          only_if_exists);
+static GtkWidget *   get_clipboard_widget (GdkDisplay       *display);
+
 
-static void clipboard_unset          (GtkClipboard      *clipboard);
-static void selection_received       (GtkWidget         *widget,
-                                     GtkSelectionData  *selection_data,
-                                     guint              time);
-static GtkClipboard *clipboard_peek  (GdkDisplay        *display,
-                                     GdkAtom            selection,
-                                     gboolean           only_if_exists);
 enum {
   TARGET_STRING,
   TARGET_TEXT,
   TARGET_COMPOUND_TEXT,
-  TARGET_UTF8_STRING
+  TARGET_UTF8_STRING,
+  TARGET_SAVE_TARGETS
 };
 
 static const gchar request_contents_key[] = "gtk-request-contents";
@@ -152,7 +169,7 @@ gtk_clipboard_class_init (GtkClipboardClass *class)
   
   gobject_class->finalize = gtk_clipboard_finalize;
 
-  class->owner_change = NULL;
+  class->owner_change = gtk_clipboard_owner_change;
 
   clipboard_signals[OWNER_CHANGE] =
     g_signal_new ("owner_change",
@@ -168,7 +185,28 @@ gtk_clipboard_class_init (GtkClipboardClass *class)
 static void
 gtk_clipboard_finalize (GObject *object)
 {
-  clipboard_unset (GTK_CLIPBOARD (object));
+  GtkClipboard *clipboard;
+  GtkWidget *clipboard_widget;
+
+  clipboard = GTK_CLIPBOARD (object);
+
+  clipboard_widget = get_clipboard_widget (clipboard->display);
+  
+  clipboard_unset (clipboard);
+  
+  if (g_main_loop_is_running (clipboard->store_loop))
+    {
+      g_main_loop_quit (clipboard->store_loop);
+      g_main_loop_unref (clipboard->store_loop);
+    }
+  
+  if (clipboard->store_timeout != 0)
+    g_source_remove (clipboard->store_timeout);
+
+  if (clipboard->notify_signal_id != 0)
+    g_signal_handler_disconnect (clipboard_widget, clipboard->notify_signal_id);
+  
+  g_free (clipboard->storable_targets);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -280,6 +318,7 @@ selection_clear_event_cb (GtkWidget     *widget,
   if (clipboard)
     {
       clipboard_unset (clipboard);
+
       return TRUE;
     }
 
@@ -592,22 +631,37 @@ clipboard_unset (GtkClipboard *clipboard)
 {
   GtkClipboardClearFunc old_clear_func;
   gpointer old_data;
+  gboolean old_have_owner;
+  gint old_n_storable_targets;
   
   old_clear_func = clipboard->clear_func;
   old_data = clipboard->user_data;
-         
-  if (clipboard->have_owner)
+  old_have_owner = clipboard->have_owner;
+  old_n_storable_targets = clipboard->n_storable_targets;
+  
+  if (old_have_owner)
     {
       clipboard_remove_owner_notify (clipboard);
       clipboard->have_owner = FALSE;
     }
-  
+
+  clipboard->n_storable_targets = -1;
+  g_free (clipboard->storable_targets);
+  clipboard->storable_targets = NULL;
+      
   clipboard->get_func = NULL;
   clipboard->clear_func = NULL;
   clipboard->user_data = NULL;
   
   if (old_clear_func)
     old_clear_func (clipboard, old_data);
+
+  /* If we've transferred the clipboard data to the manager,
+   * unref the owner
+   */
+  if (old_have_owner &&
+      old_n_storable_targets != -1)
+    g_object_unref (clipboard->user_data);
 }
 
 /**
@@ -682,6 +736,7 @@ gtk_clipboard_set_text (GtkClipboard *clipboard,
                               targets, G_N_ELEMENTS (targets),
                               text_get_func, text_clear_func,
                               g_strndup (text, len));
+  gtk_clipboard_set_can_store (clipboard, NULL, 0);
 }
 
 static void
@@ -882,6 +937,14 @@ gtk_clipboard_request_targets (GtkClipboard                *clipboard,
   
   g_return_if_fail (clipboard != NULL);
   g_return_if_fail (callback != NULL);
+
+  /* If the display supports change notification we cache targets */
+  if (gdk_display_supports_selection_notification (gtk_clipboard_get_display (clipboard)) &&
+      clipboard->n_cached_targets != -1)
+    {
+      (* callback) (clipboard, clipboard->cached_targets, clipboard->n_cached_targets, user_data);
+      return;
+    }
   
   info = g_new (RequestTargetsInfo, 1);
   info->callback = callback;
@@ -1087,8 +1150,20 @@ gtk_clipboard_wait_for_targets (GtkClipboard  *clipboard,
   
   g_return_val_if_fail (clipboard != NULL, FALSE);
 
-  /* TODO: see http://bugzilla.gnome.org/show_bug.cgi?id=101774 with regard to XFIXES */
-
+  /* If the display supports change notification we cache targets */
+  if (gdk_display_supports_selection_notification (gtk_clipboard_get_display (clipboard)) &&
+      clipboard->n_cached_targets != -1)
+    {
+      if (n_targets)
+       *n_targets = clipboard->n_cached_targets;
+      if (targets)
+       *targets = g_memdup (clipboard->cached_targets,
+                            clipboard->n_cached_targets * sizeof (GdkAtom));
+
+       return TRUE;
+    }
+  
   if (n_targets)
     *n_targets = 0;
       
@@ -1099,7 +1174,26 @@ gtk_clipboard_wait_for_targets (GtkClipboard  *clipboard,
 
   if (data)
     {
-      result = gtk_selection_data_get_targets (data, targets, n_targets);
+      GdkAtom *tmp_targets;
+      gint tmp_n_targets;
+       
+      result = gtk_selection_data_get_targets (data, &tmp_targets, &tmp_n_targets);
+      if (gdk_display_supports_selection_notification (gtk_clipboard_get_display (clipboard)))
+       {
+         clipboard->n_cached_targets = tmp_n_targets;
+         clipboard->cached_targets = g_memdup (tmp_targets,
+                                               tmp_n_targets * sizeof (GdkAtom));
+       }
+      if (n_targets)
+       *n_targets = tmp_n_targets;
+      if (targets)
+       *targets = tmp_targets;
+      else
+       g_free (tmp_targets);
+      
       gtk_selection_data_free (data);
     }
 
@@ -1135,6 +1229,8 @@ clipboard_peek (GdkDisplay *display,
       clipboard = g_object_new (GTK_TYPE_CLIPBOARD, NULL);
       clipboard->selection = selection;
       clipboard->display = display;
+      clipboard->n_cached_targets = -1;
+      clipboard->n_storable_targets = -1;
       clipboards = g_slist_prepend (clipboards, clipboard);
       g_object_set_data (G_OBJECT (display), "gtk-clipboard-list", clipboards);
       g_signal_connect (display, "closed",
@@ -1145,6 +1241,57 @@ clipboard_peek (GdkDisplay *display,
   return clipboard;
 }
 
+static void
+gtk_clipboard_owner_change (GtkClipboard        *clipboard,
+                           GdkEventOwnerChange *event)
+{
+  if (clipboard->n_cached_targets != -1)
+    {
+      clipboard->n_cached_targets = -1;
+      g_free (clipboard->cached_targets);
+    }
+}
+
+/**
+ * gtk_clipboard_wait_is_target_available:
+ * @clipboard: a #GtkClipboard
+ * @target:    A #GdkAtom indicating which target to look for.
+ *
+ * Checks if a clipboard supports pasting data of a given type. This
+ * function can be used to determine if a "Paste" menu item should be
+ * insensitive or not.
+ *
+ * If you want to see if there's text available on the clipboard, use
+ * gtk_clipboard_wait_is_text_available () instead.
+ *
+ * Return value: %TRUE if the target is available, %FALSE otherwise.
+ *
+ * Since: 2.6
+ */
+gboolean
+gtk_clipboard_wait_is_target_available (GtkClipboard *clipboard,
+                                       GdkAtom       target)
+{
+  GdkAtom *targets;
+  gint i, n_targets;
+  gboolean retval = FALSE;
+    
+  if (!gtk_clipboard_wait_for_targets (clipboard, &targets, &n_targets))
+    return FALSE;
+
+  for (i = 0; i < n_targets; i++)
+    {
+      if (targets[i] == target)
+       {
+         retval = TRUE;
+         break;
+       }
+    }
+
+  g_free (targets);
+  
+  return retval;
+}
 
 /**
  * _gtk_clipboard_handle_event:
@@ -1168,3 +1315,160 @@ _gtk_clipboard_handle_event (GdkEventOwnerChange *event)
                   clipboard_signals[OWNER_CHANGE], 0, event, NULL);
 }
 
+static gboolean
+gtk_clipboard_store_timeout (GtkClipboard *clipboard)
+{
+  g_main_loop_quit (clipboard->store_loop);
+  
+  return FALSE;
+}
+
+/**
+ * gtk_clipboard_set_can_store:
+ * @clipboard: a #GtkClipboard
+ * @targets: array containing information about which forms should be stored
+ *           or %NULL to indicate that all forms should be stored.
+ * @n_targets: number of elements in @targets
+ *
+ * Hints that the clipboard data should be stored somewhere when the
+ * application exits or when gtk_clipboard_store () is called.
+ *
+ * This value is reset when the clipboard owner changes.
+ * Where the clipboard data is stored is platform dependent,
+ * see gdk_display_store_clipboard () for more information.
+ * 
+ * Since: 2.6
+ */
+void
+gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
+                            GtkTargetEntry *targets,
+                            gint            n_targets)
+{
+  GtkWidget *clipboard_widget;
+  int i;
+  static const GtkTargetEntry save_targets[] = {
+    { "SAVE_TARGETS", 0, TARGET_SAVE_TARGETS }
+  };
+  
+  g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+  g_return_if_fail (clipboard->selection == GDK_SELECTION_CLIPBOARD);
+  
+  g_free (clipboard->storable_targets);
+  
+  clipboard_widget = get_clipboard_widget (clipboard->display);
+
+  /* n_storable_targets being -1 means that
+   * gtk_clipboard_set_can_store hasn't been called since the
+   * clipboard owner changed. We only want to add SAVE_TARGETS and 
+   * ref the owner once , so we do that here
+   */
+  
+  if (clipboard->n_storable_targets == -1)
+    {
+      gtk_selection_add_targets (clipboard_widget, clipboard->selection,
+                                save_targets, 1);
+
+      /* Ref the owner so it won't go away */
+      if (clipboard->have_owner)
+       g_object_ref (clipboard->user_data);
+    }
+  
+  clipboard->n_storable_targets = n_targets;
+  clipboard->storable_targets = g_new (GdkAtom, n_targets);
+  for (i = 0; i < n_targets; i++)
+    clipboard->storable_targets[i] = gdk_atom_intern (targets[i].target, FALSE);
+}
+
+static gboolean
+gtk_clipboard_selection_notify (GtkWidget         *widget,
+                               GdkEventSelection *event,
+                               GtkClipboard      *clipboard)
+{
+  if (event->selection == gdk_atom_intern ("CLIPBOARD_MANAGER", FALSE) &&
+      clipboard->storing_selection)
+    g_main_loop_quit (clipboard->store_loop);
+
+  return FALSE;
+}
+
+/**
+ * gtk_clipboard_store:
+ * @clipboard: a #GtkClipboard
+ *
+ * Stores the current clipboard data somewhere so that it will stay
+ * around after the application has quit.
+ *
+ * Since: 2.6
+ */
+void
+gtk_clipboard_store (GtkClipboard *clipboard)
+{
+  GtkWidget *clipboard_widget;
+
+  g_return_if_fail (GTK_IS_CLIPBOARD (clipboard));
+
+  if (clipboard->n_storable_targets < 0)
+    return;
+  
+  if (!gdk_display_supports_clipboard_persistence (clipboard->display))
+    return;
+
+  clipboard_widget = get_clipboard_widget (clipboard->display);
+  clipboard->notify_signal_id = g_signal_connect (clipboard_widget, "selection_notify_event",
+                                                 G_CALLBACK (gtk_clipboard_selection_notify), clipboard);
+  
+  gdk_display_store_clipboard (clipboard->display,
+                              clipboard_widget->window,
+                              clipboard_get_timestamp (clipboard),
+                              clipboard->storable_targets,
+                              clipboard->n_storable_targets);
+
+  clipboard->storing_selection = TRUE;
+
+  clipboard->store_loop = g_main_loop_new (NULL, TRUE);
+  clipboard->store_timeout = g_timeout_add (10000, (GSourceFunc) gtk_clipboard_store_timeout, clipboard);
+
+  if (g_main_loop_is_running (clipboard->store_loop))
+    {
+      GDK_THREADS_LEAVE ();
+      g_main_loop_run (clipboard->store_loop);
+      GDK_THREADS_ENTER ();
+    }
+  
+  g_main_loop_unref (clipboard->store_loop);
+  clipboard->store_loop = NULL;
+  
+  g_source_remove (clipboard->store_timeout);
+  clipboard->store_timeout = 0;
+  g_signal_handler_disconnect (clipboard_widget, clipboard->notify_signal_id);
+  clipboard->notify_signal_id = 0;
+  
+  clipboard->storing_selection = FALSE;
+}
+
+/* Stores all clipboard selections on all displays, called from
+ * gtk_main_quit ().
+ */
+void
+_gtk_clipboard_store_all (void)
+{
+  GtkClipboard *clipboard;
+  GSList *displays, *list;
+  
+  displays = gdk_display_manager_list_displays (gdk_display_manager_get ());
+
+  list = displays;
+  while (list)
+    {
+      GdkDisplay *display = list->data;
+
+      clipboard = clipboard_peek (display, GDK_SELECTION_CLIPBOARD, TRUE);
+
+      if (clipboard)
+       gtk_clipboard_store (clipboard);
+      
+      list = list->next;
+    }
+  g_slist_free (displays);
+  
+}
index d706567e5fd8407d7ef30ce37bf854c67abe673d..bc7da190d4f6c0d280f1dbeb7c8a000d385850e3 100644 (file)
@@ -94,19 +94,29 @@ void gtk_clipboard_request_targets  (GtkClipboard                    *clipboard,
                                     GtkClipboardTargetsReceivedFunc  callback,
                                     gpointer                         user_data);
 
-GtkSelectionData *gtk_clipboard_wait_for_contents (GtkClipboard *clipboard,
-                                                  GdkAtom       target);
-gchar *           gtk_clipboard_wait_for_text     (GtkClipboard *clipboard);
+GtkSelectionData *gtk_clipboard_wait_for_contents (GtkClipboard  *clipboard,
+                                                  GdkAtom        target);
+gchar *           gtk_clipboard_wait_for_text     (GtkClipboard  *clipboard);
+gboolean          gtk_clipboard_wait_for_targets  (GtkClipboard  *clipboard,
+                                                  GdkAtom      **targets,
+                                                  gint          *n_targets);
 
-gboolean gtk_clipboard_wait_is_text_available   (GtkClipboard         *clipboard);
+gboolean gtk_clipboard_wait_is_text_available   (GtkClipboard *clipboard);
+gboolean gtk_clipboard_wait_is_target_available (GtkClipboard *clipboard,
+                                                GdkAtom       target);
 
-gboolean gtk_clipboard_wait_for_targets (GtkClipboard  *clipboard, 
-                                        GdkAtom      **targets,
-                                        gint          *n_targets);
 
+void gtk_clipboard_set_can_store (GtkClipboard   *clipboard,
+                                 GtkTargetEntry *targets,
+                                 gint            n_targets);
+
+void gtk_clipboard_store         (GtkClipboard   *clipboard);
+  
 /* private */
 void     _gtk_clipboard_handle_event    (GdkEventOwnerChange *event);
 
+void     _gtk_clipboard_store_all       (void);
+  
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
index 40acba8fd6c33951f4491f1ae0046e3a6b3739ff..45e13b187127ed410c520899d3aec1efefc444f8 100644 (file)
@@ -954,12 +954,16 @@ gtk_main (void)
 
       gdk_flush ();
     }
-             
+    
   main_loops = g_slist_remove (main_loops, loop);
 
   g_main_loop_unref (loop);
 
   gtk_main_loop_level--;
+
+  /* Try storing all clipboard data we have */
+  if (gtk_main_loop_level == 0)
+    _gtk_clipboard_store_all ();
 }
 
 guint